Some CPPCheck clean ups

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>