cleaned things up with modals