bootstrap refactor complete