Whitespace and indentation cleanup