Refactoring - phase 11.