Fix typo and dedupe