Header refactor