Incorporate recommendations from Ruth on pull request