Made a few changes to the code

Made a few changes to the code