Refactor headers