Small refactor on URLs