Reformat

Running again for tester
Merge pull request #1072 from ptariche/patch-6

Reformat