Fix checkstyle/formatting issues