Cleaned up bootstrap