Refactor database code
Merge branch 'master' of https://github.com/iankronquist/y-cloninator