add bootstrap and refactoring