Added window class to clean up main