Perform automatic formatting

Got owned by Nate!
Merge pull request #390 from manuelbua/fix-reformat

Perform automatic formatting