Refactored header