[@Sho Minazuki]

Thanks for the feedback. I'll apply those changes soon.