Refactor (OpenModal)
Refactor (RenderModal)