Fixed some checkstyle violations