Header height mini-refactor