Improve use of bootstrap