Minor cleanup of ApiClient class