Refactor and improve export headers.