Refactors headers