Cleaning up some checkstyle issues.