bootstrap, refactoring