upd: cleanup, simplify