Since window is singleton anyway, get rid of window* parameters