add bootstrap & cleanup