split currencies into iso/non_iso along with general cleanup