some cleaning in bootstrap
some cleaning in bootstrap