Remove unneeded comment
Improve comments