I have a few optimizations for this if you're willing to give this another visit or just interested.