A few cosmetic changes