Refactoring for more boootstrap experience.