cleaned up around closing modal pop-ups