CSV cleanup and plotting ordering added