checkStyle refactoring