more checkstyle
more fixes