Clean Up figures
Final Version