Refactor and headers.