Some more minor tidy of the Network Responder