Minor BootstrapTemplate cleanup