Improve the comments to make reading the code easier