Added addressformats for France and Spain, moved the formatting code to another function