Fix variable names and comment style. NFC.