Fixing some checkstyle issues.