Quick fix/refactor routes