Minor refactoring.
Merge branch 'master' of github.com:uq-eresearch/aorra-graph-demo