minor changes
Merge pull request #33 from johnb30/reorganize

minor changes