Fixed cppcheck warnings
astyle formatting