Cleaned up bootstrap analysis code