Tidy up SubscriptionUrlGenerator code