Code standards cleanups
Improvements based on code review from @akbargumbira
Merge pull request #924 from timlinux/develop

Code standards cleanups