cppcheck style warnings
Merge pull request #201 from aghayoor/cppcheck_style

cppcheck style warnings