remove prints and rename var