Refactor to utilize Wallet.get and Wallet.set methods