Refactor notes