Code cleanup, adds OkHttp lib