refactored urls to simplify their definitions (created lists/urls to inlude in superlists/urls)