refactor build arguments