cppcheck fixes + astyle -A10 --max-code-length=80
format multiple params better
Merge pull request #414 from ged-lab/fix/cppcheck-errors

cppcheck fixes + astyle -A10 --max-code-length=80