small cleanup
rename tracking vars for clarity