Refactor DDQ