Consitency
Fix comment
Consistent style for data declerations

From
https://github.com/tibbe/haskell-style-guide/blob/master/haskell-style.md
Fix output
Remove newline
Fix indent
Fix comment
Document more fields