fix up the oop-ness
Merge pull request #1 from aranasaurus/master

fix up the oop-ness