Cleaned

Cleaned up a lot!