refactor for checkstyle
more refactoring