Map/Graph correspondance works. Cleaning up