Consistent header, yay!
cosmetic changes