* Add task description
* Simplify implementation