checkstyle fixes, round 2