Minor variable cleanup