coding standards
Fixed a few cppcheck errors & coding standards
correction of a few cppcheck errors & coding standards
Fixed regression introduced by be820e9dcf22bcd33179d741d5d61a45166e9709
Fixed another regression introduced by commit be820e9dcf22bcd33179d741d5d61a45166e9709