commit header refactoring