Round1: Checkstyle cleanup query