Fixed some comments to better follow the code flow