Added required to classes
Cleaned up some other code