Apply Greg's feedback from review