bootstrap refactor