build more refactor