Fixing comments v2