minor formatting, added CFRemove (hopefully crash fix)