Some more comments / reformatting of bootstrap logic