[*] small refactoring