Improved a bit the comments