Cleaned and organized classes.