Simplify

In particular, no longer use `_` as variable (in this scope).