Class Cleanup

Everybody Cleanup