Bootstrap refactor