Some cleaning on the comments