Polishing of visitors

This PR finished a TODO item.
This should be inside the if statement