cleaning up windowGroup code for the class