A bunch of formatting/syntax cleanups, No functional changes or fixes.