Minor internal cleanup of header formatting