Improve the comments