got rid of window.Class for all classes