Update URIs
Cleanup
Refactor duplicated logic