Minor code cleanup, changed applicable CityGraph methods "inherit" their Graph equivalent, updated benchmark to run the 500x500 test