Updated CoFH and cleaned up