minor bootstrap restructure