Improve comments
Improve comments further