Cosmetic changes (header guards)