code cleanup
Merge pull request #136 from nitrous24/master

Ohshi code cleanup