Improve comments
Add doc