low-hanging nits
other nits
Merge pull request #30 from atax1a/master

more low-hanging nits.