Minor internal cleanup of header formatting

Ah, that seems reasonable. Maybe a comment could replace the messages?