evredis refactoring finished