Cleanup
New way to define cost_matrice