fix method name
optimize code
optimize code