some var cleanup