more cleanup to header comments