Fix reformat target after reorg
Reformat
Changes suggested by cppcheck