refactored given checkstyle.xml