Minor changes in the code