Update the method name to be more readable
Change some methods name and implementation code