builder task refactoring