Refactor eredis_client