Whitespace cleanup and indentation fixes