rename function for clarity
better modal cleanup