#SB-236: Create an HttpClientFactory for repositories

- Minor changes after refactoring.