stylistic update
twilio
fixed merge conflicts