refactor route-matching strategies

remove the else for just a return