Added changes requested in the comments