Refactored bootstrap class