Live Plot: Further refactoring. Generally the same sort of thing mentioned in the last commit.