Trying to clean up the modal.