Cleaned up the base files. Still have to clean handler and plotter