formatter and checkstyle changes