Incorporated Sendgrid's comments