Cosmetic changes to header guard