Minor clean up.
Saving this for backup. not because it's used anywhere.
Minor refactoring, after failed attempt to introduce unittest.
Merge branch 'master' of github.com:AdaHeads/DatabaseServers