Simplified logic in NoteValidator