cleaned up bootstrap