awoods - code review updates

No need to do anything with this PR. I am just passing it along to show you what changes I made to your commits.