Clean up errors introduced in previous merge
correct class number for class 4
Merge pull request #3 from sabreuse/class-cleanup

Clean up errors introduced in previous merge