formatting
Merge branch 'cppforlife/cleanup-formatting' into develop