refactored duplicated urls