Refactored code - created a seperate class for getting setting AccountType for typesafety

Refactored code - created a seperate class for getting setting
AccountType for typesafety