cleaned up Window