Clean up code style surrounding bootstrap creation