utilize short closures and new line chaining to improve readability and prep for better diffs.

no behavior change, purely formatting.