tidied up salesforce streaming api wrapper