cleaned up DB initialization