Made changes according to Andrea's feedback https://redpen.io/hq9476274f7c0cd7f7