Some cppcheck cleaning
Merge pull request #31 from serval2412/master

Some cppcheck cleaning