Whitespace cleanup: ~80 columns, hanging indentation