Almost done cleaning up
Cleaned even upper