cleaned up the windowing portion of the 2D engine