Fixed NAFQA-185. Improvements to CheckStyle plugin
  - fix after refactoring