Made the changes requested in the code reivew