Refactoring new routine modals