Little bit of refactoring to the URL