Clean up
Swap order of arguments in Graph functions
Small cleanup