slight cleanup for the rift code