refactoring
refactoring
notes update