Tweaks based on team feedback

This PR has a few tweaks, after getting feedback from the rest of the team.