Reformatted code; regenerated all plots