refactor routes collection