[cleanup] Wrapped makeapi-client instead of passing reference around