Cleaned up Graph class