Fix remaining checkstyle issues