Hi David, 

Thanks for the feedback. I’ll clean up the duplicated code and move common parts  in the next version.

Best regards,
Wang Lian