Refactoring modals
Refactoring modals