readability changes
Merge pull request #17 from mikem5/master

some minor changes for readability