Don't use `yyp`
Refactoring