Refactor bootstrap: part 2