Cleaned up database creation