Refactor dust.
Refactor dust.