Minor code clean-up janitorial fixes, address issues found with static analysis tool

[ColinIanKing]

I ran cppcheck on the source, found some minor issues that can be cleaned-up.