Nice header dummy refactoring