Refactor make route