remove unnecessary commas, remove state as not really needed, change address formatting