Some minor changes in the code