Fix original data
Add formatter for area code data