Few more cosmetic changes