last checkstyle fixes