more checkstyle cleanup