Fixed some formatting issues.

A lot of code was touched to fix issues raised by hlint (mostly redundant brackets).