Refactoring - phase 10.