cleanup / cppcheck warnings