Simplify plots and correct typo in calculation of plots