Refactor header.feature