Minor cosmetic changes!