Finished with the hlint cleanup.

Most of the code has been refactored nicely now.