Bootstrap file refactored/cleaned up.