Tidy up the gateway hostapd stuff a bit