Re-factored bootstrap file to read more cleanly.