refactoring to yo format