Some minor adjustments done