more small cleanup of classes