Cleaned up some url code