Code style changes to conform to white team standards