Made the databases a little cleaner and more reasonable