Fixed some checkstyle bugs