Cleanups
Added isCurrentlyShowing