#29 refactor some method name