Cleaned up Graph and Dijkstra