Bootstrap refactoring