hy, refactor code with DCI