Slight ExthHeader refactor