plot 11.7, more code cleaning