cleanup + added MAC address