refactoring
doc fix