Refactored bootstrap a little bit