Refactoring some classes.