Converting back to not passing pointers to the window