refactor, fix route