Refactored TodoBuilder.