refactored the Account Class