Coding standards improvements.
A couple more.
Merge pull request #1 from DrewAPicture/standards

Coding standards improvements.