Clean up and fix scoring process