Committing changes suggested by Andrew Davis peer review