Cleaned up some classes, fixed degree requirement bug