Clean up indentation and formatting