8 - Refactor header