Use point-free style

Code was refactored to use point-free style and functional utilities were reformatted to make them easier to read.