Cleaned up bootstrap file