Minor global var cleanup