Refactoring ModalControllers