Refactoring boostrapper