Code style changes #2