refactoring name and  add log