Since you've shown me your code as well, I'll show you mine - but I want your opinion on it. I think it's more clear, clean, and concise than the original:
https://ottrbutt.com/tmp/sk1024_djm.clAwesome, I will take a look at it sometime tonight or tomorrow and report back.