Rename variable, remove MAC address gathering