code cleanup to please the pep8 gods
fixed unit test
code cleanup to please the pep8 gods
Merge pull request #469 from nlake44/db-cleanup

code cleanup to please the pep8 gods