refactor(account): no more accountData and less usage of currentAccount