interpreter header refactoring