Removed unneeded inner enum and made other inner class static.
Merge pull request #98 from drtimwright/master

Removed unneeded inner enum and made other inner class static.