Code

use config.DATABASE in cases where 'db' was still hard-coded