Fix typo and simplify treatments