class files visitors refactored