Fixed some checkstyle warnings