Refactor + clean up of WLPRestClient