cleaned up the bootstrap