* MANTA-30

cppcheck fixes & astyle reformatting