Header commit

Header code cleanup