Refactoring - phase 9.