Code cleanup of classes.