Window: small cleanup