clean up some var names