routing - 9. Refactor (end)