Clean up code case
Add background task