Formatting and code cleanup.