cleaning up factories
Merge branch 'master' of https://github.com/joshuavial/banqer