refactoring - bootstrapper