Improve some comments