Improve indentation and formatting.