Some small cosmetic changes