cleaned up class schema definition