improve methods name
improve code style