Mainly cosmetic changes