Fix stupid typo & little cleanup.