misc nits
review comments
Merge pull request #1738 from devoncarew/devoncarew_nits

misc nits