some line edits -- mostly stylistic
Merge pull request #1 from thisisparker/master

some line edits -- mostly stylistic