MAINT: Changes based on review.