Few additional cosmetic changes