Some small changes
Some small changes in the code