* Improve the wording (thanks to Ed Maste for the suggestion)
* Add a TODO item