[upd] clean & refactoring