urltool small reactoring