Code style and cleanup.