[FIX] cppcheck fixes
Merge pull request #2 from timosachsenberg/feature/coding-style-improvements

[FIX] cppcheck fixes contributed by timosachsenberg