Code review feedback
Improve some comments