Do some refactoring
update notes again
update notes again