Refactor sodium-tool
Refactor the Clean module (no existential quantification)