Code style cleanup