This seems much cleaner, thanks for your awesome work.

I'm going to wait a bit for others feedback. If there are no r-, I'll merge.