Updated comments to make it pleasant for future updates