Code: Formatting and cleanup.