refactor visitor
Merge pull request #688 from jialinsun/master

refactor visitor