Header edit and more cleanup