Removed not useful comments
Updated logic for a "task done"