Fixed up database setting
Formatting
Formatting