Continute update to latest header format

Also, cleanup a bunch of trailing whitespace.