FIXED: Code Quality - Issues reported by CppCheck.