Added all the suggestions made by reviewers