Finish Refactoring chapter