Cabalizing.
Some hlint and other tidying.