refactor builder & target