Formatting and structural cleanup.