Complete cleanup into "class"
Merge pull request #7 from bencevans/chore/cleanup

Complete cleanup into "class"