Added multi plot
Cleanup