cleaning up more window/reframehandle code