finished uri refactor