Code style and code cleanup.