cosmetic variable/function name changes