Code cleanup
updated plots and datafile