Url.py clean up

Url.py clean up