Boot refactoring