some c++ edits.  Nothing major - just reorg
Merge pull request #11 from synthicity/cpp-code-review

some c++ edits.  Nothing major - just reorg