leap header refactor