Cleanup task
Reformat