Refactorin DW chapter