Fixed plotting functions, ditched top level class