Bootstrap optimization, less formatting tweaks