Refactoring classes.
More refactoring.