Improving the structure of the classes.