Refactored booting