token exposure closed by regeneration
refactoring and view little edit