Added the latest suggestions made by reviewers