notes update
refactoring