code refactor, ROUTES