npm/805-non-visual-refactor