refactoring in Bootstrapper