Refactoring header