Light cleanup of bootstrap and new spec state methods