Refactor builder