nits
Merge pull request #2112 from devoncarew/devoncarew_nits2

nits