Simplify and fix typo