Good practices changes on Plots files