Refactor default headers