A little less class
A little more structure
Merge pull request #148 from CodaFi/fingers-crossed

Declassify
Merge remote-tracking branch 'upstream/master'