Clean up header a bit