(*) Made EndPoint strings more readable