Refactor the header a bit