Checkstyle2 refactored