Format contact addresses a little better