Type cleanup, window now exiting cleanly