Refactoring headers