Code cleanup, embedded OkHttp