[UPDATE] minor refactoring