[upd] a little bit refactoring