Code style improvement
Add a few comments