Clean up clean_url function