Review feedback

This is some review feedback that I accidentally didn't push before merging.