Header cleanup

Accidentally started looking at the wrong header, ended up cleaning up this one a bit.  Main change is to improve the rules for deciding on a display name.