Minor refactoring
Changed header section