Refactor with a vengeance