Function header refactoring