Minor cleanup in booting code