Refactored the bootstrapper a bit.