Refactor header