note variety refactor