cleaned up comments in Window.h and made static instance var names unique