routes refactorization