Fix header
Refactor