Re-format headers