[MIN] refactorings, checkstyle warnings