cleanup
rename var
rename