Refactoring and class creation.