Fix quality flaw small refactoring of SubscriptionBaseVisitor
Fix quality flaws