upd
update & cleanup