update bootstrap, refactoring