Small refactor in header and friends