refactored code from SubscriptionController
debuggin refactor
Removed prop bug
Updated properties file variable names and affect classes
refactored classes