more cleanup before merging this into one big plotting program