fix class name typo and a cosmetic change