Some cosmetic fixes
Merge pull request #108 from dcousens/cosmetics

Some cosmetic fixes