Refactor out the header