Refactoring URLbuilder