more checkstyle warnings fixed, satisfaction tests
remove a lot of checkstyle warnings, tiny refactors