refactor ya