remove redundant and unnecessary classes
Merge pull request #10 from jenius/dry-classes

DRY up the classes