Made the logic around the bootstrap object less confusing