refactor uribuilder