Re-arranged GameWindow code