Updated comments to better reflect recent changes