Improve the code comments