Cleaned up code/ added cluster and energy histograms