Cleaned some checkstyle violations, build still failing