Cleaned out window class