Further code cleanup in GameWindow