Cleanup indentation and whitespace