Incorporate @j-rivero's feedback.