Clear up mentioning of classes.