[Ray lightning 1.6] update the change according to the comment in #163

[JiahaoYao]

This pr is to address the leftover commments in the #163 , and i answered all the questions and made the consistent changes here.