refactor and cleanup for URI seeOther approach