Bootstrap refacoring