refactor modal
refactor modal