Cleanup & Update plots for *some* readability