Remove hack for stylish-haskell to ignore SOURCE pragmas
Formatting and minor renames