Add some comments to ease reading of the code