Better formatting of data from wallets