refactor builder
refactor build