Basic header fixes
Reformat
Reformat
Reformat
Typos, clean up, header slimming, etc