cleaning up

also, making modal() and openModal() the same