[CHG] bootstrap refactoring