Refactor - plotting.
Refactor - cleanup.