Refactor bootstrap
Merge