clear up some var name confusion