Builder refactoring