Hey @tastycode, thanks for your review!

I just changed the implementation using your suggestions.