Update comments to fit the state of the code