refactor of routing