Use location as key in graph, cleanup graph methods to match snake case