Continue of style cop refactoring.