Clean up the checkstyle warnings