> Both LGTM, thanks for the cleanups!

Pushed, thanks for the review!