refactor affix visitors