Class refactoring.