Update plots for better code reuse