note
refactoring
a few clarifications