Correct some checkstyle