Ran hlint over source files, and tidied them up a bit
Fixed some warnings