Cleanup of bootstrapping code, support command line or environment supply of config file