Some var cleanup