Review comments

This will get squashed to previous commits when the whole PR is ready to go