Improve comments
Fix typo