Refactoring toyoda