Refactored the Bootstrap class