Various formatting fixes: tailing whitespace, 80 col, etc