Some checkstyle cleanup