rediss refactor