CheckStryle refactoring