Small code review changes
Merge pull request #202 from dburdick/develop

Small code review changes