Minimum viable refactor of the bootstrap process.