Improve a few comments