renamed database-formatter to databaseformatter for consistency