refactor, clarity in notes