Refactored the account