Refactoring 07 removing temps