Remove cruft, lint formatting and whitespace