refactored bootstrap
whitespaces