Clean code via cppcheck