Make the frequency configurable
Cleanup