Indentation changes and cleanup.