Fixed comment issues