refactor/cleanup bootstrapping