Cleaned up Bootstrap