refactored some urls