formatting and checkstyle fixes