Updated useBonfire - cleaned code