Fix typo, account storage data argument, minor cleanup