Updated comments to make sense