fix bootstrap
small refactoring