Header refactoring