Refactor urrything