Right. Could you create a separate issue for this re-factoring? 

@lorraineachapman Maybe this re-factoring work can be a part of the road-map?