Tidy up Locations markup