Cleaning up Subscription and Switching code