Refactor NoteView