Some minor changes done