Remove 'return' left over from testing.
Rename main plot function.