Notes Refactoring