refactor to generator defaults