DRYing it up and PR comments