Refactor

churnbee & customerio.

cc @calvinfo @gjohnson