removed more checkstyle warnings; tiny refactors and renamings