Change tikz print to use pgfplots

Use pgfplots

Clean comments