Fix typo and remove comments