clean-up and add bootstrap