Move visitor to seperate file