Minor language improvements
Merge pull request #1 from pwaller/master

Minor language improvements