reorganize account address formatting