Cleaned up windows