Incorporate Sean's feedback.