Few small cosmetic changes