qszhuan | #1754: refactoring