Refactoring

Refactoring checkstyle