Review comment from Jesse.

I suppose there's no need for this class to change