Ran hlint and addressed issues it found. More code reduction.