More Bootstrap refactoring