Code cleanup for Uri and Utilities