Unit tested isBootstrapped(), minor formatting changes