Made the data plotting functions classes for easier manipulation