Add cppcheck target & make suggested changes
Add cppcheck target & make suggested changes