cleaned up scoring class