improve bootstrap code