Refactor bootstrap: part 3