Remove unnecessary sleep
Add TODO
Add whitespace for readability
Ensure a default timeframe is set