Cleaned up Window class