minor refactoring
minor upd