Fred - Minor editing of classes