PHOT-46:  checkstyle refactoring