Make bootstrap script more self-contained