Refactoring - phase 12.