Neaten bootstrap script