[CHG] refactor