Making changes as per the comments