Refactor LogoTreeVisitor