Refactor

churnbee & customerio.

cc @calvinfo @gjohnson 
nit: duplicate key ;)

:dancers: