Code cleaned up, update subscriptions parameters change