Refactor of classes.