Simplified code and finished DB create+schema