[Change] small refactoring