Made it easier to sanitize sensitive info

Separated out the sensitive variables so that
    they're easier to sanitize.