Code formatting and cleanup.