Refactoring classes.