Send the discovery message more frequently
Refactor things