Cleaned up DB creation