Fixed formatting and removed extra db_api