Switch to generator expression