Refactoring and objectification.