* remove unecessary `with()` helper calls

when we have a well defined closure, there is no reason to use the `with()` helper, or even the closure at all. in most cases, but using a temporary variable we achieve the same effect with arguably cleaner easier to read code.

* style fixes

* revert refactor

I can't figure out how to fix the tests right now, so reverting these