A D/Refactor////