headers refactoring