Merge plot_data.py from branch 'max-clean'
Style and code fixes to plot_data.py