Changed signature of setup method, no longer returns $self
Moved match_file out of visit