Tidy up address formatting