Reformat and Whitespace cleanup
Merge pull request #3 from FestusHagen/fh_1.64_0

Reformat and Whitespace cleanup