Finished code formatting

Remove the comma between state/province and zip code and the extra line break after city