80-column without leading spaces
80 column, trailing whitespace and add {} to has fields
trailing whitespace and fix grouping logic
update grouper data to match new logic