refactor headers