clean up and tweak figure 2 again