Checkstyle, idea warnings
Refactorings