Refine method name and comments
Refine method name and comments