YA refactoring