Change ExactTarget references to Salesforce; plus some whitespace cleanup