Headers refactoring
Refactoring headers