Resolves #93. hlint applied to all files and everything fixed.