Refactoring for routing screen