cleaned up classes for comparison.