Simplify Window class