Formatting and checkstyle - pass1