UrlBuilder - some cleaning