addded access modifiers to classes, removed this. for instance variables, changed enum name to singular