Update deprecated http client method. Minor cleanup.