Clean up scorer implementation; all tests pass.